From 6e3dd6dd6287cbc5aa17e779f35a3a31138f7db8 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 12 Feb 2020 14:26:16 +0100 Subject: [PATCH] profile: Use separate names for frameclock marks instead of using details The marks are averaged based on the name, so this makes more sense. Also rename the map/unmap marks to have the same capitalization as everything else. --- gdk/gdkframeclock.c | 8 ++++---- gdk/x11/gdkdisplay-x11.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdk/gdkframeclock.c b/gdk/gdkframeclock.c index ee76368935..ca0bd56b87 100644 --- a/gdk/gdkframeclock.c +++ b/gdk/gdkframeclock.c @@ -664,7 +664,7 @@ _gdk_frame_clock_emit_update (GdkFrameClock *frame_clock) g_signal_emit (frame_clock, signals[UPDATE], 0); if (GDK_PROFILER_IS_RUNNING) - gdk_profiler_end_mark (before, "frameclock", "update"); + gdk_profiler_end_mark (before, "frameclock update", NULL); } void @@ -675,7 +675,7 @@ _gdk_frame_clock_emit_layout (GdkFrameClock *frame_clock) g_signal_emit (frame_clock, signals[LAYOUT], 0); if (GDK_PROFILER_IS_RUNNING) - gdk_profiler_end_mark (before, "frameclock", "layout"); + gdk_profiler_end_mark (before, "frameclock layout", NULL); } void @@ -686,7 +686,7 @@ _gdk_frame_clock_emit_paint (GdkFrameClock *frame_clock) g_signal_emit (frame_clock, signals[PAINT], 0); if (GDK_PROFILER_IS_RUNNING) - gdk_profiler_end_mark (before, "frameclock", "paint"); + gdk_profiler_end_mark (before, "frameclock paint", NULL); } void @@ -777,7 +777,7 @@ _gdk_frame_clock_add_timings_to_profiler (GdkFrameClock *clock, { if (timings->presentation_time != 0) { - gdk_profiler_add_mark (timings->presentation_time, 0, "frameclock", "presentation"); + gdk_profiler_add_mark (timings->presentation_time, 0, "presented window", NULL); gdk_profiler_set_counter (fps_counter, timings->presentation_time, frame_clock_get_fps (clock)); diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 0d442aac8f..7c143b52ff 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -883,7 +883,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator, _gdk_x11_surface_grab_check_unmap (surface, xevent->xany.serial); if (GDK_PROFILER_IS_RUNNING) - gdk_profiler_add_markf (g_get_monotonic_time (), 0, "Unmapped window", "0x%lx", GDK_SURFACE_XID (surface)); + gdk_profiler_add_markf (g_get_monotonic_time (), 0, "unmapped window", "0x%lx", GDK_SURFACE_XID (surface)); } return_val = FALSE; @@ -908,7 +908,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator, if (GDK_PROFILER_IS_RUNNING) { - gdk_profiler_end_markf (surface_impl->map_time, "Mapped window", "0x%lx", GDK_SURFACE_XID (surface)); + gdk_profiler_end_markf (surface_impl->map_time, "mapped window", "0x%lx", GDK_SURFACE_XID (surface)); surface_impl->map_time = 0; } } -- 2.30.2